diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d0eed17c..56b17699b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 2.11.2
+- [Fix Sql dependency collection bug in .NET Core 3.0 with Microsoft.Data.SqlClient.](https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/1291)
+
 ## Version 2.11.1
 - [Fix Sql dependency parent id to match W3CTraceContext format](https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/1277)
 - [Fix EventCounters so that it appear as CustomMetrics as opposed to PerformanceCounters.](https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/1280)
diff --git a/GlobalStaticVersion.props b/GlobalStaticVersion.props
index 008bfd1d2..c5f971f07 100644
--- a/GlobalStaticVersion.props
+++ b/GlobalStaticVersion.props
@@ -7,7 +7,7 @@
     -->
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>11</SemanticVersionMinor>
-    <SemanticVersionPatch>1</SemanticVersionPatch>
+    <SemanticVersionPatch>2</SemanticVersionPatch>
     <!--Valid values: beta1, beta2, EMPTY for stable -->
     <PreReleaseMilestone></PreReleaseMilestone>
     <!-- 
diff --git a/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs b/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs
index 51191dbd2..27b4bd65b 100644
--- a/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs
+++ b/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs
@@ -198,6 +198,53 @@ public void TracksCommandExecuted(string beforeCommand, string afterCommand)
             Assert.True(Math.Abs((start - dependencyTelemetry.Timestamp).TotalMilliseconds) <= 16);
         }
 
+        [Theory]
+        [InlineData(SqlClientDiagnosticSourceListener.SqlBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlAfterExecuteCommand)]
+        [InlineData(SqlClientDiagnosticSourceListener.SqlMicrosoftBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlMicrosoftAfterExecuteCommand)]
+        public void TracksCommandExecutedSP(string beforeCommand, string afterCommand)
+        {
+            var operationId = Guid.NewGuid();
+            var sqlConnection = new SqlConnection(TestConnectionString);
+            var sqlCommand = sqlConnection.CreateCommand();
+            sqlCommand.CommandText = "SP_GetOrders";
+            sqlCommand.CommandType = CommandType.StoredProcedure;
+
+            var beforeExecuteEventData = new
+            {
+                OperationId = operationId,
+                Command = sqlCommand,
+                Timestamp = (long?)1000000L
+            };
+
+            this.fakeSqlClientDiagnosticSource.Write(
+                beforeCommand,
+                beforeExecuteEventData);
+            var start = DateTimeOffset.UtcNow;
+
+            var afterExecuteEventData = new
+            {
+                OperationId = operationId,
+                Command = sqlCommand,
+                Timestamp = 2000000L
+            };
+
+            this.fakeSqlClientDiagnosticSource.Write(
+                afterCommand,
+                afterExecuteEventData);
+
+            var dependencyTelemetry = (DependencyTelemetry)this.sendItems.Single();
+
+            Assert.Equal(beforeExecuteEventData.OperationId.ToString("N"), dependencyTelemetry.Id);
+            Assert.Equal(sqlCommand.CommandText, dependencyTelemetry.Data);
+            Assert.Equal("(localdb)\\MSSQLLocalDB | master | SP_GetOrders", dependencyTelemetry.Name);
+            Assert.Equal("(localdb)\\MSSQLLocalDB | master", dependencyTelemetry.Target);
+            Assert.Equal(RemoteDependencyConstants.SQL, dependencyTelemetry.Type);
+            Assert.True((bool)dependencyTelemetry.Success);
+            Assert.True(dependencyTelemetry.Duration > TimeSpan.Zero);
+            Assert.True(dependencyTelemetry.Duration < TimeSpan.FromMilliseconds(500));
+            Assert.True(Math.Abs((start - dependencyTelemetry.Timestamp).TotalMilliseconds) <= 16);
+        }
+
         [Theory]
         [InlineData(SqlClientDiagnosticSourceListener.SqlBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlAfterExecuteCommand)]
         [InlineData(SqlClientDiagnosticSourceListener.SqlMicrosoftBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlMicrosoftAfterExecuteCommand)]
diff --git a/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticFetcherTypes.cs b/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticFetcherTypes.cs
index b59939c07..7a95a4c8c 100644
--- a/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticFetcherTypes.cs
+++ b/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticFetcherTypes.cs
@@ -11,7 +11,7 @@ internal static class SqlClientDiagnosticFetcherTypes
         //// http://github.com/dotnet/corefx/blob/master/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlClientDiagnosticListenerExtensions.cs
         //// https://github.com/dotnet/SqlClient/blob/master/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientDiagnosticListenerExtensions.cs
 
-#region "System.Data fetchers"
+        #region "System.Data fetchers"
 
         /// <summary> Fetchers for execute command before event. </summary>
         internal static class CommandBefore
@@ -41,6 +41,7 @@ internal static class CommandError
             public static readonly PropertyFetcher Command = new PropertyFetcher(nameof(Command));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for connection open/close before events. </summary>
@@ -68,6 +69,7 @@ internal static class ConnectionError
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit before events. </summary>
@@ -118,6 +120,7 @@ internal static class TransactionRollbackError
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit error events. </summary>
@@ -127,9 +130,10 @@ internal static class TransactionCommitError
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
         #endregion
-        
+
         #region "Microsoft.Data fetchers"
 
         /// <summary> Fetchers for execute command before event. </summary>
@@ -160,6 +164,7 @@ internal static class CommandErrorMicrosoft
             public static readonly PropertyFetcher Command = new PropertyFetcher(nameof(Command));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for connection open/close before events. </summary>
@@ -187,6 +192,7 @@ internal static class ConnectionErrorMicrosoft
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit before events. </summary>
@@ -237,6 +243,7 @@ internal static class TransactionRollbackErrorMicrosoft
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit error events. </summary>
@@ -246,6 +253,7 @@ internal static class TransactionCommitErrorMicrosoft
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
         #endregion
     }
diff --git a/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticSourceListener.cs b/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticSourceListener.cs
index de0f7ef22..2575f07d4 100644
--- a/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticSourceListener.cs
+++ b/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticSourceListener.cs
@@ -2,8 +2,6 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation.SqlCl
 {
     using System;
     using System.Collections.Generic;
-    using System.Data;
-    using System.Data.SqlClient;
     using System.Diagnostics;
     using System.Globalization;
 
@@ -154,14 +152,15 @@ void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object>
 
                     case SqlErrorExecuteCommand:
                         {
-                            this.ErrorExecuteHelper(evnt, CommandError.OperationId, CommandError.Command, CommandError.Timestamp, CommandError.Exception);
+                            this.ErrorExecuteHelper(evnt, CommandError.OperationId, CommandError.Command, CommandError.Timestamp,
+                                CommandError.Exception, CommandError.Number);
                             break;
                         }
 
                     case SqlMicrosoftErrorExecuteCommand:
                         {
                             this.ErrorExecuteHelper(evnt, CommandErrorMicrosoft.OperationId, CommandErrorMicrosoft.Command,
-                                CommandErrorMicrosoft.Timestamp, CommandErrorMicrosoft.Exception);
+                                CommandErrorMicrosoft.Timestamp, CommandErrorMicrosoft.Exception, CommandErrorMicrosoft.Number);
                             break;
                         }
 
@@ -202,14 +201,14 @@ void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object>
                     case SqlErrorOpenConnection:
                         {
                             this.ErrorOpenConnectionHelper(evnt, ConnectionError.OperationId, ConnectionError.Connection,
-                                ConnectionError.Timestamp, ConnectionError.Exception);
+                                ConnectionError.Timestamp, ConnectionError.Exception, ConnectionError.Number);
                             break;
                         }
 
                     case SqlMicrosoftErrorOpenConnection:
                         {
                             this.ErrorOpenConnectionHelper(evnt, ConnectionErrorMicrosoft.OperationId, ConnectionErrorMicrosoft.Connection,
-                                ConnectionErrorMicrosoft.Timestamp, ConnectionErrorMicrosoft.Exception);
+                                ConnectionErrorMicrosoft.Timestamp, ConnectionErrorMicrosoft.Exception, ConnectionErrorMicrosoft.Number);
                             break;
                         }
 
@@ -296,7 +295,8 @@ void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object>
                             this.ErrorCommitHelper(evnt, TransactionCommitError.OperationId,
                                 TransactionCommitError.Connection,
                                 TransactionCommitError.Timestamp,
-                                TransactionCommitError.Exception);
+                                TransactionCommitError.Exception,
+                                TransactionCommitError.Number);
                             break;
                         }
 
@@ -305,7 +305,8 @@ void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object>
                             this.ErrorCommitHelper(evnt, TransactionCommitErrorMicrosoft.OperationId,
                                 TransactionCommitErrorMicrosoft.Connection,
                                 TransactionCommitErrorMicrosoft.Timestamp,
-                                TransactionCommitErrorMicrosoft.Exception);
+                                TransactionCommitErrorMicrosoft.Exception,
+                                TransactionCommitErrorMicrosoft.Number);
                             break;
                         }
 
@@ -314,7 +315,8 @@ void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object>
                             this.ErrorRollbackHelper(evnt, TransactionRollbackError.OperationId,
                                 TransactionRollbackError.Connection,
                                 TransactionRollbackError.Timestamp,
-                                TransactionRollbackError.Exception);
+                                TransactionRollbackError.Exception,
+                                TransactionRollbackError.Number);
                             break;
                         }
 
@@ -323,7 +325,8 @@ void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object>
                             this.ErrorRollbackHelper(evnt, TransactionRollbackErrorMicrosoft.OperationId,
                                 TransactionRollbackErrorMicrosoft.Connection,
                                 TransactionRollbackErrorMicrosoft.Timestamp,
-                                TransactionRollbackErrorMicrosoft.Exception);
+                                TransactionRollbackErrorMicrosoft.Exception,
+                                TransactionRollbackErrorMicrosoft.Number);
                             break;
                         }
                 }
@@ -358,7 +361,7 @@ private static void InitializeTelemetry(DependencyTelemetry telemetry, Guid oper
                     telemetry.Context.Operation.Id = activity.RootId;
                     telemetry.Context.Operation.ParentId = activity.Id;
                 }
-                
+
                 foreach (var item in activity.Baggage)
                 {
                     if (!telemetry.Properties.ContainsKey(item.Key))
@@ -373,18 +376,23 @@ private static void InitializeTelemetry(DependencyTelemetry telemetry, Guid oper
             }
         }
 
-        private static void ConfigureExceptionTelemetry(DependencyTelemetry telemetry, Exception exception)
+        private static void ConfigureExceptionTelemetry(DependencyTelemetry telemetry, Exception exception, PropertyFetcher numberFetcher)
         {
             telemetry.Success = false;
             telemetry.Properties["Exception"] = exception.ToInvariantString();
 
-            if (exception is SqlException sqlException)
+            try
             {
-                telemetry.ResultCode = sqlException.Number.ToString(CultureInfo.InvariantCulture);
+                var exceptionNumber = (int)numberFetcher.Fetch(exception);
+                telemetry.ResultCode = exceptionNumber.ToString(CultureInfo.InvariantCulture);
+            }
+            catch (Exception)
+            {
+                // Ignore as it simply indicate exception was not a SqlException
             }
         }
 
-        private void BeforeExecuteHelper(KeyValuePair<string, object> evnt, 
+        private void BeforeExecuteHelper(KeyValuePair<string, object> evnt,
             PropertyFetcher operationIdFetcher,
             PropertyFetcher commandFetcher,
             PropertyFetcher commandTextFetcher,
@@ -413,7 +421,9 @@ private void BeforeExecuteHelper(KeyValuePair<string, object> evnt,
                     var database = databaseFetcher.Fetch(con);
                     target = string.Join(" | ", dataSource, database);
 
-                    var commandName = (CommandType)commandTypeFetcher.Fetch(command) == CommandType.StoredProcedure
+                    // https://docs.microsoft.com/dotnet/api/system.data.commandtype
+                    // 4 indicate StoredProcedure
+                    var commandName = (int)commandTypeFetcher.Fetch(command) == 4
                         ? commandText
                         : string.Empty;
 
@@ -482,7 +492,8 @@ private void ErrorExecuteHelper(KeyValuePair<string, object> evnt,
             PropertyFetcher operationIdFetcher,
             PropertyFetcher commandFetcher,
             PropertyFetcher timestampFetcher,
-            PropertyFetcher exceptionFetcher)
+            PropertyFetcher exceptionFetcher,
+            PropertyFetcher numberFetcher)
         {
             var operationId = (Guid)operationIdFetcher.Fetch(evnt.Value);
 
@@ -503,7 +514,7 @@ private void ErrorExecuteHelper(KeyValuePair<string, object> evnt,
 
                 var exception = (Exception)exceptionFetcher.Fetch(evnt.Value);
 
-                ConfigureExceptionTelemetry(telemetry, exception);
+                ConfigureExceptionTelemetry(telemetry, exception, numberFetcher);
 
                 this.client.TrackDependency(telemetry);
             }
@@ -578,7 +589,8 @@ private void ErrorOpenConnectionHelper(KeyValuePair<string, object> evnt,
             PropertyFetcher operationIdFetcher,
             PropertyFetcher connectionFetcher,
             PropertyFetcher timestampFetcher,
-            PropertyFetcher exceptionFetcher)
+            PropertyFetcher exceptionFetcher,
+            PropertyFetcher numberFetcher)
         {
             var operationId = (Guid)operationIdFetcher.Fetch(evnt.Value);
 
@@ -599,7 +611,7 @@ private void ErrorOpenConnectionHelper(KeyValuePair<string, object> evnt,
 
                 var exception = (Exception)exceptionFetcher.Fetch(evnt.Value);
 
-                ConfigureExceptionTelemetry(telemetry, exception);
+                ConfigureExceptionTelemetry(telemetry, exception, numberFetcher);
 
                 this.client.TrackDependency(telemetry);
             }
@@ -622,13 +634,13 @@ private void BeforeCommitHelper(KeyValuePair<string, object> evnt,
 
             DependencyCollectorEventSource.Log.SqlClientDiagnosticSubscriberCallbackCalled(operationId, evnt.Key);
 
-            var connection = (SqlConnection)connectionFetcher.Fetch(evnt.Value);
+            var connection = connectionFetcher.Fetch(evnt.Value);
 
             if (this.operationHolder.Get(connection) == null)
             {
                 var operation = (string)operationFetcher.Fetch(evnt.Value);
                 var timestamp = (long)timestampFetcher.Fetch(evnt.Value);
-                var isolationLevel = (IsolationLevel)isolationFetcher.Fetch(evnt.Value);
+                var isolationLevel = isolationFetcher.Fetch(evnt.Value);
                 var dataSource = (string)datasourceFetcher.Fetch(connection);
                 var database = (string)databaseFetcher.Fetch(connection);
 
@@ -672,7 +684,7 @@ private void BeforeRollbackHelper(KeyValuePair<string, object> evnt,
                 {
                     var operation = (string)operationFetcher.Fetch(evnt.Value);
                     var timestamp = (long)timestampFetcher.Fetch(evnt.Value);
-                    var isolationLevel = (IsolationLevel)isolationFetcher.Fetch(evnt.Value);
+                    var isolationLevel = isolationFetcher.Fetch(evnt.Value);
                     var dataSource = (string)datasourceFetcher.Fetch(connection);
                     var database = (string)databaseFetcher.Fetch(connection);
 
@@ -763,7 +775,8 @@ private void ErrorCommitHelper(KeyValuePair<string, object> evnt,
             PropertyFetcher operationIdFetcher,
             PropertyFetcher connectionFetcher,
             PropertyFetcher timestampFetcher,
-            PropertyFetcher exceptionFetcher)
+            PropertyFetcher exceptionFetcher,
+            PropertyFetcher numberFetcher)
         {
             var operationId = (Guid)operationIdFetcher.Fetch(evnt.Value);
 
@@ -784,7 +797,7 @@ private void ErrorCommitHelper(KeyValuePair<string, object> evnt,
 
                 var exception = (Exception)exceptionFetcher.Fetch(evnt.Value);
 
-                ConfigureExceptionTelemetry(telemetry, exception);
+                ConfigureExceptionTelemetry(telemetry, exception, numberFetcher);
 
                 this.client.TrackDependency(telemetry);
             }
@@ -798,7 +811,8 @@ private void ErrorRollbackHelper(KeyValuePair<string, object> evnt,
             PropertyFetcher operationIdFetcher,
             PropertyFetcher connectionFetcher,
             PropertyFetcher timestampFetcher,
-            PropertyFetcher exceptionFetcher)
+            PropertyFetcher exceptionFetcher,
+            PropertyFetcher numberFetcher)
         {
             var operationId = (Guid)operationIdFetcher.Fetch(evnt.Value);
 
@@ -819,7 +833,7 @@ private void ErrorRollbackHelper(KeyValuePair<string, object> evnt,
 
                 var exception = (Exception)exceptionFetcher.Fetch(evnt.Value);
 
-                ConfigureExceptionTelemetry(telemetry, exception);
+                ConfigureExceptionTelemetry(telemetry, exception, numberFetcher);
 
                 this.client.TrackDependency(telemetry);
             }