Got rid of 1200 resharper warnings.

c-j-hughes · c-j-hughes · commit c609507065ed · 2019-07-16T14:41:40.000+09:30
diff --git a/AdoNetCore.AseClient.sln.DotSettings b/AdoNetCore.AseClient.sln.DotSettings
@@ -1,2 +1,9 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=colindex/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=MAXOUTPUTPRECISION/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=MAXOUTPUTSCALE/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=MAXPRECISION/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=MAXSCALE/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sendable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unpooled/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/AdoNetCore.AseClient/AseClientPermission.cs b/src/AdoNetCore.AseClient/AseClientPermission.cs
@@ -1,4 +1,4 @@
-﻿#if ENABLE_DB_DATAPERMISSION
+#if ENABLE_DB_DATAPERMISSION
 using System;
 using System.Data;
 using System.Data.Common;
@@ -23,7 +23,7 @@ public AseClientPermission() : base(default(PermissionState)) { }
         public AseClientPermission(PermissionState state) : base(default(PermissionState)) { }
         public AseClientPermission(PermissionState state, bool allowBlankPassword) : base(default(PermissionState)) { }
         public override void Add(string connectionString, string restrictions, KeyRestrictionBehavior behavior) { }
-        public override System.Security.IPermission Copy() { return null; }
+        public override System.Security.IPermission Copy() { return new AseClientPermission(); }
     }
 }
 #endif
diff --git a/src/AdoNetCore.AseClient/AseCommand.cs b/src/AdoNetCore.AseClient/AseCommand.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Data;
 using System.Data.Common;
 using System.IO;
@@ -159,7 +159,7 @@ public override int ExecuteNonQuery()
             }
 
             LogExecution(nameof(ExecuteNonQuery));
-            return _connection.InternalConnection.ExecuteNonQuery(this, (AseTransaction)Transaction);
+            return _connection.InternalConnection.ExecuteNonQuery(this, Transaction);
         }
 
         /// <summary>
@@ -180,7 +180,7 @@ public override int ExecuteNonQuery()
             }
 
             LogExecution(nameof(ExecuteReader));
-            return (AseDataReader)_connection.InternalConnection.ExecuteReader(behavior, this, (AseTransaction)Transaction);
+            return (AseDataReader)_connection.InternalConnection.ExecuteReader(behavior, this, Transaction);
         }
 
         /// <summary>		
@@ -221,7 +221,7 @@ public override object ExecuteScalar()
             }
 
             LogExecution(nameof(ExecuteScalar));
-            return _connection.InternalConnection.ExecuteScalar(this, (AseTransaction)Transaction);
+            return _connection.InternalConnection.ExecuteScalar(this, Transaction);
         }
 
         private void LogExecution(string methodName)
@@ -519,7 +519,7 @@ public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationTok
                 throw new ObjectDisposedException(nameof(AseCommand));
             }
 
-            return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteNonQueryTaskRunnable(this, (AseTransaction)Transaction), cancellationToken);
+            return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteNonQueryTaskRunnable(this, Transaction), cancellationToken);
         }
 
         protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
@@ -529,7 +529,7 @@ protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior b
                 throw new ObjectDisposedException(nameof(AseCommand));
             }
 
-            return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteReaderTaskRunnable(behavior, this, (AseTransaction)Transaction), cancellationToken);
+            return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteReaderTaskRunnable(behavior, this, Transaction), cancellationToken);
         }
 
         public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken)
diff --git a/src/AdoNetCore.AseClient/AseDataReader.cs b/src/AdoNetCore.AseClient/AseDataReader.cs
@@ -19,14 +19,21 @@ public sealed class AseDataReader : DbDataReader
 #if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS
         private readonly AseCommand _command;
         private DataTable _currentSchemaTable;
-#endif
 
         internal AseDataReader(IEnumerable<TableResult> results, AseCommand command, CommandBehavior behavior)
         {
             _results = results.ToArray();
-#if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS
             _command = command;
+
+            _behavior = behavior;
+            NextResult();
+        }
 #endif
+
+        internal AseDataReader(IEnumerable<TableResult> results, CommandBehavior behavior)
+        {
+            _results = results.ToArray();
+
             _behavior = behavior;
             NextResult();
         }
diff --git a/src/AdoNetCore.AseClient/AseDataReaderEnumerator.cs b/src/AdoNetCore.AseClient/AseDataReaderEnumerator.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections;
 
 namespace AdoNetCore.AseClient
@@ -12,7 +12,7 @@ internal sealed class AseDataReaderEnumerator : IEnumerator
 
         public AseDataReaderEnumerator(AseDataReader dataReader)
         {
-            this._dataReader = dataReader;
+            _dataReader = dataReader;
         }
 
         public void Reset()
@@ -37,4 +37,4 @@ public bool MoveNext()
             return _dataReader.Read();
         }
     }
-}
+}
diff --git a/src/AdoNetCore.AseClient/AseDbType.cs b/src/AdoNetCore.AseClient/AseDbType.cs
@@ -1,4 +1,3 @@
-using System.Data;
 // ReSharper disable UnusedMember.Global
 
 namespace AdoNetCore.AseClient
diff --git a/src/AdoNetCore.AseClient/AseDecimal.cs b/src/AdoNetCore.AseClient/AseDecimal.cs
@@ -486,7 +486,7 @@ public static explicit operator AseDecimal(int value)
 
         public static explicit operator AseDecimal(double value)
         {
-            return new AseDecimal((BigDecimal) value);
+            return new AseDecimal(value);
         }
 
         public static explicit operator AseDecimal(decimal value)
diff --git a/src/AdoNetCore.AseClient/AseException.cs b/src/AdoNetCore.AseClient/AseException.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+using System;
 #if ENABLE_SYSTEMEXCEPTION
 using System.Runtime.Serialization;
 #endif
@@ -27,13 +26,13 @@ public sealed class AseException :
         /// </remarks>
         public AseErrorCollection Errors
         {
-            get; private set;
+            get;
         }
 
         /// <summary>
         /// This method returns the message of the most severe error.
         /// </summary>
-        public override string Message => this.Errors.MainError == null ? string.Empty : this.Errors.MainError.Message;
+        public override string Message => Errors.MainError == null ? string.Empty : Errors.MainError.Message;
 
         /// <summary>
         /// Constructor function for an <see cref="AseException" /> instance.
diff --git a/src/AdoNetCore.AseClient/AseParameterCollection.cs b/src/AdoNetCore.AseClient/AseParameterCollection.cs
@@ -521,7 +521,10 @@ public override void RemoveAt(int index)
         /// <param name="index">The starting index of the array.</param>
         public override void CopyTo(Array array, int index)
         {
-            ((IList)_parameters).CopyTo(array, index);
+            if (array != null)
+            {
+                ((IList)_parameters).CopyTo(array, index);
+            }
         }
 
         /// <summary>
diff --git a/src/AdoNetCore.AseClient/Internal/IniReader.cs b/src/AdoNetCore.AseClient/Internal/IniReader.cs
@@ -45,14 +45,14 @@ private IniEntry QueryFirstService(StreamReader reader)
             {
                 var serviceNameLine = reader.ReadLine();
 
-                if (ServiceRegex.IsMatch(serviceNameLine))
+                if (serviceNameLine != null && ServiceRegex.IsMatch(serviceNameLine))
                 {
                     while (!reader.EndOfStream)
                     {
-                        var dataLine = reader.ReadLine().Trim();
+                        var dataLine = reader.ReadLine()?.Trim();
 
                         // If we are still reading data.
-                        if (!ServiceRegex.IsMatch(dataLine))
+                        if (dataLine != null && !ServiceRegex.IsMatch(dataLine))
                         {
                             var match = IniEntryRegex.Match(dataLine);
 
@@ -82,14 +82,14 @@ private IniEntry QueryServiceByServiceName(StreamReader reader, string serviceNa
             {
                 var serviceNameLine = reader.ReadLine();
 
-                if (serviceNameRegex.IsMatch(serviceNameLine))
+                if (serviceNameLine != null && serviceNameRegex.IsMatch(serviceNameLine))
                 {
                     while (!reader.EndOfStream)
                     {
-                        var dataLine = reader.ReadLine().Trim();
+                        var dataLine = reader.ReadLine()?.Trim();
 
                         // If we are still reading data.
-                        if (!ServiceRegex.IsMatch(dataLine))
+                        if (dataLine != null && !ServiceRegex.IsMatch(dataLine))
                         {
                             var match = IniEntryRegex.Match(dataLine);
 
diff --git a/src/AdoNetCore.AseClient/Internal/InternalConnection.cs b/src/AdoNetCore.AseClient/Internal/InternalConnection.cs
@@ -298,7 +298,11 @@ private void InternalExecuteQueryAsync(AseCommand command, AseTransaction transa
                 }
                 else
                 {
+#if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS
                     readerSource.TrySetResult(new AseDataReader(dataReaderHandler.Results(), command, behavior));
+#else
+                    readerSource.TrySetResult(new AseDataReader(dataReaderHandler.Results(), behavior));
+#endif
                 }
             }
             catch (Exception ex)
@@ -360,7 +364,7 @@ public int ExecuteNonQuery(AseCommand command, AseTransaction transaction)
             }
             catch (AggregateException ae)
             {
-                ExceptionDispatchInfo.Capture(ae.InnerException).Throw();
+                ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();
                 throw;
             }
         }
@@ -382,7 +386,7 @@ public DbDataReader ExecuteReader(CommandBehavior behavior, AseCommand command,
             }
             catch (AggregateException ae)
             {
-                ExceptionDispatchInfo.Capture(ae.InnerException).Throw();
+                ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();
                 throw;
             }
         }
diff --git a/src/AdoNetCore.AseClient/Internal/InternalConnectionFactory.cs b/src/AdoNetCore.AseClient/Internal/InternalConnectionFactory.cs
@@ -33,14 +33,14 @@ public Task<IInternalConnection> GetNewConnection(CancellationToken token, IInfo
             }
             catch (AseException)
             {
-                connection?.Dispose();
+                connection.Dispose();
                 socket?.Dispose();
                 throw;
             }
             catch(Exception ex)
             {
                 Logger.Instance?.WriteLine($"{nameof(InternalConnectionFactory)}.{nameof(GetNewConnection)} encountered exception: {ex}");
-                connection?.Dispose();
+                connection.Dispose();
                 socket?.Dispose();
                 throw new OperationCanceledException();
             }
@@ -117,7 +117,7 @@ private static IPAddress ResolveAddress(string server, CancellationToken token)
             }
             catch (AggregateException ae)
             {
-                ExceptionDispatchInfo.Capture(ae.InnerException).Throw();
+                ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();
                 throw;
             }
 
diff --git a/src/AdoNetCore.AseClient/Internal/ParameterValueExtensions.cs b/src/AdoNetCore.AseClient/Internal/ParameterValueExtensions.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace AdoNetCore.AseClient.Internal
 {
diff --git a/src/AdoNetCore.AseClient/Internal/ReadablePartialStream.cs b/src/AdoNetCore.AseClient/Internal/ReadablePartialStream.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Diagnostics;
+using System;
 using System.IO;
 
 namespace AdoNetCore.AseClient.Internal
diff --git a/src/AdoNetCore.AseClient/Internal/SqlDecimal.cs b/src/AdoNetCore.AseClient/Internal/SqlDecimal.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 /*
@@ -34,8 +34,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Diagnostics;
 using System.Globalization;
-// ReSharper disable InconsistentNaming
-// ReSharper disable MemberCanBePrivate.Global
+
+// ReSharper disable All
 
 namespace AdoNetCore.AseClient.Internal
 {
@@ -1770,4 +1770,4 @@ public override int GetHashCode()
 
         public static readonly SqlDecimal Null = new SqlDecimal(true);
     } // SqlDecimal
-} // namespace System.Data.SqlTypes
+} // namespace System.Data.SqlTypes
diff --git a/src/AdoNetCore.AseClient/Packet/AttentionPacket.cs b/src/AdoNetCore.AseClient/Packet/AttentionPacket.cs
@@ -1,5 +1,4 @@
-﻿using System.IO;
-using System.Text;
+using System.IO;
 using AdoNetCore.AseClient.Enum;
 using AdoNetCore.AseClient.Interface;
 using AdoNetCore.AseClient.Internal;
diff --git a/src/AdoNetCore.AseClient/Packet/NormalPacket.cs b/src/AdoNetCore.AseClient/Packet/NormalPacket.cs
@@ -1,6 +1,5 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using AdoNetCore.AseClient.Enum;
 using AdoNetCore.AseClient.Interface;
 using AdoNetCore.AseClient.Internal;
diff --git a/src/AdoNetCore.AseClient/Token/CatchAllToken.cs b/src/AdoNetCore.AseClient/Token/CatchAllToken.cs
@@ -34,7 +34,6 @@ public void Read(Stream stream, DbEnvironment env, IFormatToken previous)
         /// The token's length or the length of its remaining length indicator is encoded in the token's type.
         /// </summary>
         /// <param name="stream"></param>
-        /// <param name="type"></param>
         /// <returns></returns>
         private uint CalculateRemainingLength(Stream stream)
         {
diff --git a/test/AdoNetCore.AseClient.Tests/Benchmark/Benchmarks.cs b/test/AdoNetCore.AseClient.Tests/Benchmark/Benchmarks.cs
@@ -10,14 +10,14 @@ public partial class Benchmarks<T> where T : IConnectionProvider
     {
         // This connection string is used for setting up the database. It requires DDL permissions. Adjust accordingly.
         private string _setupConnectionString;
-        private IConnectionProvider _connectionProvider;
+        private T _connectionProvider;
 
         public string UnpooledConnectionString { get; } =ConnectionStrings.NonPooled;
 
         public string PooledConnectionString => ConnectionStrings.Pooled10;
 
 
-        private void Initialise(IConnectionProvider connectionProvider)
+        private void Initialise(T connectionProvider)
         {
             _connectionProvider = connectionProvider;
             _setupConnectionString = _setupConnectionString ?? UnpooledConnectionString;
@@ -259,6 +259,7 @@ public sealed class DataItem
         /// <summary>
         /// The Name of the records from the database.
         /// </summary>
+        // ReSharper disable once UnusedAutoPropertyAccessor.Global
         public string Name { get; set; }
 
         /// <summary>
diff --git a/test/AdoNetCore.AseClient.Tests/CodeSamples.cs b/test/AdoNetCore.AseClient.Tests/CodeSamples.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using Dapper;
 using NUnit.Framework;
+// ReSharper disable All
 #pragma warning disable 219
 
 namespace AdoNetCore.AseClient.Tests
diff --git a/test/AdoNetCore.AseClient.Tests/Integration/Connection/InfoMessageTests.cs b/test/AdoNetCore.AseClient.Tests/Integration/Connection/InfoMessageTests.cs
@@ -85,7 +85,10 @@ public void ExecuteRaiseError_OutputsInfoMessages()
                 {
                     connection.Execute(@"raiserror 17001 'AAA'", commandType: CommandType.Text);
                 }
-                catch { }
+                catch
+                {
+                    // ignored
+                }
 
                 connection.InfoMessage -= handlerFunc;
 
diff --git a/test/AdoNetCore.AseClient.Tests/Integration/LoginTests.cs b/test/AdoNetCore.AseClient.Tests/Integration/LoginTests.cs
@@ -91,7 +91,7 @@ public void Login_Blitz(int size, int threads, string cs)
             }
             catch (AggregateException ae)
             {
-                ExceptionDispatchInfo.Capture(ae.InnerException).Throw();
+                ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();
                 throw;
             }
 
diff --git a/test/AdoNetCore.AseClient.Tests/Integration/TestEnvironmentHealthTests.cs b/test/AdoNetCore.AseClient.Tests/Integration/TestEnvironmentHealthTests.cs
@@ -1,4 +1,3 @@
-using System;
 using NUnit.Framework;
 
 namespace AdoNetCore.AseClient.Tests.Integration
diff --git a/test/AdoNetCore.AseClient.Tests/ParameterProvider/CoreFxParameterProvider.cs b/test/AdoNetCore.AseClient.Tests/ParameterProvider/CoreFxParameterProvider.cs
@@ -7,7 +7,7 @@ public class CoreFxParameterProvider : IParameterProvider
     {
         public DbParameter GetParameter()
         {
-            return new AdoNetCore.AseClient.AseParameter();
+            return new AseParameter();
         }
         public DbParameter GetParameter(string parameterName, string aseDbType)
         {
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/AseConnectionTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/AseConnectionTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/AseDbTypeTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/AseDbTypeTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/AseDecimalTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/AseDecimalTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/AseParameterCollectionTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/AseParameterCollectionTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/AseParameterComparisonTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/AseParameterComparisonTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/ConnectionPoolTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/ConnectionPoolTests.cs
diff --git a/test/AdoNetCore.AseClient.Tests/Unit/EnvChangeTokenHandlerTests.cs b/test/AdoNetCore.AseClient.Tests/Unit/EnvChangeTokenHandlerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if ENABLE_DB_DATAPERMISSION`
	`1`	`+#if ENABLE_DB_DATAPERMISSION`
`2`	`2`	`using System;`
`3`	`3`	`using System.Data;`
`4`	`4`	`using System.Data.Common;`
`@@ -23,7 +23,7 @@ public AseClientPermission() : base(default(PermissionState)) { }`
`23`	`23`	`public AseClientPermission(PermissionState state) : base(default(PermissionState)) { }`
`24`	`24`	`public AseClientPermission(PermissionState state, bool allowBlankPassword) : base(default(PermissionState)) { }`
`25`	`25`	`public override void Add(string connectionString, string restrictions, KeyRestrictionBehavior behavior) { }`
`26`		`- public override System.Security.IPermission Copy() { return null; }`
	`26`	`+ public override System.Security.IPermission Copy() { return new AseClientPermission(); }`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Data;`
`3`	`3`	`using System.Data.Common;`
`4`	`4`	`using System.IO;`
`@@ -159,7 +159,7 @@ public override int ExecuteNonQuery()`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`LogExecution(nameof(ExecuteNonQuery));`
`162`		`- return _connection.InternalConnection.ExecuteNonQuery(this, (AseTransaction)Transaction);`
	`162`	`+ return _connection.InternalConnection.ExecuteNonQuery(this, Transaction);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`/// <summary>`
`@@ -180,7 +180,7 @@ public override int ExecuteNonQuery()`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`LogExecution(nameof(ExecuteReader));`
`183`		`- return (AseDataReader)_connection.InternalConnection.ExecuteReader(behavior, this, (AseTransaction)Transaction);`
	`183`	`+ return (AseDataReader)_connection.InternalConnection.ExecuteReader(behavior, this, Transaction);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/// <summary>`
`@@ -221,7 +221,7 @@ public override object ExecuteScalar()`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`LogExecution(nameof(ExecuteScalar));`
`224`		`- return _connection.InternalConnection.ExecuteScalar(this, (AseTransaction)Transaction);`
	`224`	`+ return _connection.InternalConnection.ExecuteScalar(this, Transaction);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`private void LogExecution(string methodName)`
`@@ -519,7 +519,7 @@ public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationTok`
`519`	`519`	`throw new ObjectDisposedException(nameof(AseCommand));`
`520`	`520`	`}`
`521`	`521`
`522`		`- return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteNonQueryTaskRunnable(this, (AseTransaction)Transaction), cancellationToken);`
	`522`	`+ return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteNonQueryTaskRunnable(this, Transaction), cancellationToken);`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)`
`@@ -529,7 +529,7 @@ protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior b`
`529`	`529`	`throw new ObjectDisposedException(nameof(AseCommand));`
`530`	`530`	`}`
`531`	`531`
`532`		`- return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteReaderTaskRunnable(behavior, this, (AseTransaction)Transaction), cancellationToken);`
	`532`	`+ return InternalExecuteAsync(() => _connection.InternalConnection.ExecuteReaderTaskRunnable(behavior, this, Transaction), cancellationToken);`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Data;`
`2`	`1`	`// ReSharper disable UnusedMember.Global`
`3`	`2`
`4`	`3`	`namespace AdoNetCore.AseClient`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ public static explicit operator AseDecimal(int value)`
`486`	`486`
`487`	`487`	`public static explicit operator AseDecimal(double value)`
`488`	`488`	`{`
`489`		`- return new AseDecimal((BigDecimal) value);`
	`489`	`+ return new AseDecimal(value);`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`public static explicit operator AseDecimal(decimal value)`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,10 @@ public override void RemoveAt(int index)`
`521`	`521`	`/// <param name="index">The starting index of the array.</param>`
`522`	`522`	`public override void CopyTo(Array array, int index)`
`523`	`523`	`{`
`524`		`- ((IList)_parameters).CopyTo(array, index);`
	`524`	`+ if (array != null)`
	`525`	`+ {`
	`526`	`+ ((IList)_parameters).CopyTo(array, index);`
	`527`	`+ }`
`525`	`528`	`}`
`526`	`529`
`527`	`530`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,14 @@ private IniEntry QueryFirstService(StreamReader reader)`
`45`	`45`	`{`
`46`	`46`	`var serviceNameLine = reader.ReadLine();`
`47`	`47`
`48`		`- if (ServiceRegex.IsMatch(serviceNameLine))`
	`48`	`+ if (serviceNameLine != null && ServiceRegex.IsMatch(serviceNameLine))`
`49`	`49`	`{`
`50`	`50`	`while (!reader.EndOfStream)`
`51`	`51`	`{`
`52`		`- var dataLine = reader.ReadLine().Trim();`
	`52`	`+ var dataLine = reader.ReadLine()?.Trim();`
`53`	`53`
`54`	`54`	`// If we are still reading data.`
`55`		`- if (!ServiceRegex.IsMatch(dataLine))`
	`55`	`+ if (dataLine != null && !ServiceRegex.IsMatch(dataLine))`
`56`	`56`	`{`
`57`	`57`	`var match = IniEntryRegex.Match(dataLine);`
`58`	`58`
`@@ -82,14 +82,14 @@ private IniEntry QueryServiceByServiceName(StreamReader reader, string serviceNa`
`82`	`82`	`{`
`83`	`83`	`var serviceNameLine = reader.ReadLine();`
`84`	`84`
`85`		`- if (serviceNameRegex.IsMatch(serviceNameLine))`
	`85`	`+ if (serviceNameLine != null && serviceNameRegex.IsMatch(serviceNameLine))`
`86`	`86`	`{`
`87`	`87`	`while (!reader.EndOfStream)`
`88`	`88`	`{`
`89`		`- var dataLine = reader.ReadLine().Trim();`
	`89`	`+ var dataLine = reader.ReadLine()?.Trim();`
`90`	`90`
`91`	`91`	`// If we are still reading data.`
`92`		`- if (!ServiceRegex.IsMatch(dataLine))`
	`92`	`+ if (dataLine != null && !ServiceRegex.IsMatch(dataLine))`
`93`	`93`	`{`
`94`	`94`	`var match = IniEntryRegex.Match(dataLine);`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,11 @@ private void InternalExecuteQueryAsync(AseCommand command, AseTransaction transa`
`298`	`298`	`}`
`299`	`299`	`else`
`300`	`300`	`{`
	`301`	`+#if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS`
`301`	`302`	`readerSource.TrySetResult(new AseDataReader(dataReaderHandler.Results(), command, behavior));`
	`303`	`+#else`
	`304`	`+ readerSource.TrySetResult(new AseDataReader(dataReaderHandler.Results(), behavior));`
	`305`	`+#endif`
`302`	`306`	`}`
`303`	`307`	`}`
`304`	`308`	`catch (Exception ex)`
`@@ -360,7 +364,7 @@ public int ExecuteNonQuery(AseCommand command, AseTransaction transaction)`
`360`	`364`	`}`
`361`	`365`	`catch (AggregateException ae)`
`362`	`366`	`{`
`363`		`- ExceptionDispatchInfo.Capture(ae.InnerException).Throw();`
	`367`	`+ ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();`
`364`	`368`	`throw;`
`365`	`369`	`}`
`366`	`370`	`}`
`@@ -382,7 +386,7 @@ public DbDataReader ExecuteReader(CommandBehavior behavior, AseCommand command,`
`382`	`386`	`}`
`383`	`387`	`catch (AggregateException ae)`
`384`	`388`	`{`
`385`		`- ExceptionDispatchInfo.Capture(ae.InnerException).Throw();`
	`389`	`+ ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();`
`386`	`390`	`throw;`
`387`	`391`	`}`
`388`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@ public Task<IInternalConnection> GetNewConnection(CancellationToken token, IInfo`
`33`	`33`	`}`
`34`	`34`	`catch (AseException)`
`35`	`35`	`{`
`36`		`- connection?.Dispose();`
	`36`	`+ connection.Dispose();`
`37`	`37`	`socket?.Dispose();`
`38`	`38`	`throw;`
`39`	`39`	`}`
`40`	`40`	`catch(Exception ex)`
`41`	`41`	`{`
`42`	`42`	`Logger.Instance?.WriteLine($"{nameof(InternalConnectionFactory)}.{nameof(GetNewConnection)} encountered exception: {ex}");`
`43`		`- connection?.Dispose();`
	`43`	`+ connection.Dispose();`
`44`	`44`	`socket?.Dispose();`
`45`	`45`	`throw new OperationCanceledException();`
`46`	`46`	`}`
`@@ -117,7 +117,7 @@ private static IPAddress ResolveAddress(string server, CancellationToken token)`
`117`	`117`	`}`
`118`	`118`	`catch (AggregateException ae)`
`119`	`119`	`{`
`120`		`- ExceptionDispatchInfo.Capture(ae.InnerException).Throw();`
	`120`	`+ ExceptionDispatchInfo.Capture(ae.InnerException ?? ae).Throw();`
`121`	`121`	`throw;`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`	`2`
`5`	`3`	`namespace AdoNetCore.AseClient.Internal`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public void Read(Stream stream, DbEnvironment env, IFormatToken previous)`
`34`	`34`	`/// The token's length or the length of its remaining length indicator is encoded in the token's type.`
`35`	`35`	`/// </summary>`
`36`	`36`	`/// <param name="stream"></param>`
`37`		`- /// <param name="type"></param>`
`38`	`37`	`/// <returns></returns>`
`39`	`38`	`private uint CalculateRemainingLength(Stream stream)`
`40`	`39`	`{`