Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
61ed5c2
Merge InternalsVisibleTo attribute
edwardneal Sep 10, 2025
c253b8c
netfx: sync collection syntax from netcore
edwardneal Sep 10, 2025
adf79e3
netfx: reorder SspiContextProvider property
edwardneal Sep 10, 2025
b6315e4
netfx, netcore: harmonise usage of GetOpenTdsConnection
edwardneal Sep 10, 2025
09bc6fd
netfx: port #378
edwardneal Sep 10, 2025
44df943
netfx: port #379
edwardneal Sep 10, 2025
20dd63a
netfx: sync use of named parameters
edwardneal Sep 10, 2025
2f6b38e
netfx: move GetSchema and CopyFrom from SqlConnectionHelper
edwardneal Sep 10, 2025
4ae818d
netfx: port dotnet/corefx#34047
edwardneal Sep 10, 2025
09b5377
netcore, netfx: sync constructor
edwardneal Sep 10, 2025
14f7c6e
netfx, netcore: sync designer attributes
edwardneal Sep 10, 2025
b8f7c85
netcore, netfx: sync trace messages
edwardneal Sep 10, 2025
26c732a
netcore, netfx: sync whitespace and comment changes
edwardneal Sep 10, 2025
e1ce3d8
netfx, netcore: conditionally compile CAS
edwardneal Sep 10, 2025
f7b25c0
netfx, netcore: conditionally compile WindowsIdentity impersonation
edwardneal Sep 10, 2025
1452ba9
netcore: prevent changing password when Authentication is Active Dire…
edwardneal Sep 10, 2025
aec831f
netfx, netcore: merge differing approaches to InfoMessage
edwardneal Sep 10, 2025
b966f7a
netcore, netfx: final conditional compilations needed to render files…
edwardneal Sep 10, 2025
82414f8
Final move of SqlConnection
edwardneal Sep 10, 2025
b8bf2b9
Remediate XML documentation paths
edwardneal Sep 10, 2025
f122aa4
netcore, netfx: add designer attribute to ref projects
edwardneal Sep 11, 2025
825b723
Missing debug assertion
edwardneal Sep 11, 2025
02980de
Add CS0618 to the NotSupported target
edwardneal Sep 11, 2025
9e11e79
First code review response
edwardneal Sep 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ private static readonly ConcurrentDictionary<string, IList<string>> _ColumnEncry
capacity: 1,
comparer: StringComparer.OrdinalIgnoreCase);

private static readonly Action<object> s_openAsyncCancel = OpenAsyncCancel;
private static readonly Action<Task<object>, object> s_openAsyncComplete = OpenAsyncComplete;

private bool IsProviderRetriable => SqlConfigurableRetryFactory.IsRetriable(RetryLogicProvider);
Expand Down Expand Up @@ -1768,7 +1769,7 @@ private Task InternalOpenAsync(SqlConnectionOverrides overrides, CancellationTok
CancellationTokenRegistration registration = new CancellationTokenRegistration();
if (cancellationToken.CanBeCanceled)
{
registration = cancellationToken.Register(() => completion.TrySetCanceled());
registration = cancellationToken.Register(s_openAsyncCancel, completion);
}
OpenAsyncRetry retry = new OpenAsyncRetry(this, completion, result, overrides, registration);
_currentCompletion = new Tuple<TaskCompletionSource<DbConnectionInternal>, Task>(completion, result.Task);
Expand Down Expand Up @@ -1810,6 +1811,11 @@ private static void OpenAsyncComplete(Task<object> task, object state)
}
}

private static void OpenAsyncCancel(object state)
{
((TaskCompletionSource<DbConnectionInternal>)state).TrySetCanceled();
}

private class OpenAsyncRetry
{
private SqlConnection _parent;
Expand Down