Skip to content

Commit 80da656

Browse files
Fix merge conflict damage in LocalAppContextSwitchesHelper
The 'accept both' merge resolution dropped a SetSwitchValue( token in Dispose() and a closing brace plus /// <summary> between UseLegacyIdleTimeoutBehavior and UseOverallConnectTimeoutForPoolWait, causing CS1002/CS1513 compile errors.
1 parent 228fe6f commit 80da656

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ public void Dispose()
191191
SetSwitchValue(
192192
"s_useLegacyIdleTimeoutBehavior",
193193
_useLegacyIdleTimeoutBehaviorOriginal);
194+
SetSwitchValue(
194195
"s_useOverallConnectTimeoutForPoolWait",
195196
_useOverallConnectTimeoutForPoolWaitOriginal);
196197
#if NET && _WINDOWS
@@ -345,6 +346,9 @@ public bool? UseLegacyIdleTimeoutBehavior
345346
{
346347
get => GetSwitchValue("s_useLegacyIdleTimeoutBehavior");
347348
set => SetSwitchValue("s_useLegacyIdleTimeoutBehavior", value);
349+
}
350+
351+
/// <summary>
348352
/// Get or set the UseOverallConnectTimeoutForPoolWait switch value.
349353
/// </summary>
350354
public bool? UseOverallConnectTimeoutForPoolWait

0 commit comments

Comments
 (0)